Merge "Save state, and restore when back from back stack" into sc-dev am: 3ab1528c06

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

Change-Id: Ife3ff245400d0afc58f79c2675b560b3ce36be93