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: I0140784c2be6eb84fc74b04c34fbc7a87898d3ac