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

Change-Id: I804674ca46826202d2b4bf37f4962cca8c7cda01