Merge "Merge "Add proper color management into ColorFade." into qt-r1-dev am: 58184123 am: 833b33ca" into qt-qpr1-dev-plus-aosp