Merge "Make all handheld grids scalable" into tm-qpr-dev