Merge "Enable dynamic height for wallpaper preview" into main