Merge "Update display color mode before white balance" into qt-r1-dev
am: f2c8370d3c

Change-Id: I70a9533b8c297f37005d86bc5d69dd06c671be92