Merge "Add proper color management into ColorFade." into qt-r1-dev am: 5818412305
am: 833b33ca5f

Change-Id: I9b3ef16279cbd5597b86870eae7d52a11c25292b