Merge "Fix shortcuts flash in wallpaper picker preview" into main