Merge "Mitigate screen flashing on overlay change." into qt-dev