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: Ia3dc7adfef636058c4e58116004636712b76964e