Merge "Fixes lock screen live preview in color picker" into udc-qpr-dev