Merge "Disable color sampling while navigation bar is hidden" into qt-dev