Merge "Replace shelf height with keep clear areas registration in Launcher." into tm-qpr-dev