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