Merge "Revert change in qs padding in portrait" into tm-qpr-dev