Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev am: 1cde12bc1c

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

Change-Id: Ib92c1d9a44c0a6f34d1e05a93139dde7489d4ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>