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