Merge "Defer adding surface changed callback until view root is valid" into tm-qpr-dev am: c04576ad6e am: 9411d64586

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

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