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

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

Change-Id: I11309897619e03e3cffec7cf9c3d0d65b5b5f641