Merge "Revert and fix "Fix for color picker pager getting clipped"" into tm-qpr-dev