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

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

Change-Id: I1a2e870c50489c8c3c0ca6b83290b3ea08e1016b