Merge "Revert^2 "Return to Launcher Home after wallpaper/grid apply"" into sc-dev am: ace7a8238d

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

Change-Id: I929c020463cd39889c950c385144b8484d95bf71