Merge "Fixes to remove controls for tablet" into tm-qpr-dev