Merge "Disable auto dimming when color sampling is enabled" into qt-dev