Merge "Only set property state after back button instantiated" into sc-v2-dev...

Merge "Only set property state after back button instantiated" into sc-v2-dev am: f7602976 am: 909f0087

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

Change-Id: Ie788a1703004377e9fc15e16e893096d301e4a04