Merge "Merge "Add proper color management into ColorFade." into qt-r1-dev am: 5818412305 am: 833b33ca5f" into qt-qpr1-dev-plus-aosp
am: 337d2e923f

Change-Id: I81c90f921180f30494d55e239cb5fd34eacf4f3f