Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev
am: 818fff840a

Change-Id: I9c9495e9b3f0d6dfcd890364ea94092a3c534110