Merge "Fix color picker scroll position resets on select (1/2)" into udc-qpr-dev