Merge "Fix glitchy animation in Settings" into sc-dev am: 686eff64e3 am: 2f1179b589

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/14928657

Change-Id: I4066f9fb85fe9952f0b8d4eafccf4045b79fb369