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

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

Change-Id: Ic09e6ca9e609d319504e542fa03f1335bdb8488c