Merge "Disable auto dimming when color sampling is enabled" into qt-dev
am: 28706f020b

Change-Id: Ibc07ee44c30b76e2ddf1aa4b1f7bef07a3a39ae3