Merge "Improvements for All Apps on different display sizes" into tm-qpr-dev