Merge "Disable auto dimming when color sampling is enabled" into qt-dev am: 28706f02 am: 5479f654 am: beeb8ee8 Change-Id: Ic5ff250048c4515d9d40340d5adc78314be1f3ed