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

Change-Id: I049d8f8ca8e82e56f067128c40c3d3954770c295