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

Change-Id: I9fdfeab2919220b58a554baef63e04137ecddcf3