Merge "Skip setShelfHeight if Launcher is not started" into sc-dev am: da21eb9159 am: a5157934ac am: 22ae42f603

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

Change-Id: I45297f29c3213bb9f552ee78e8b16e4a3f17855c