Merge "Fix application overlay visibility bug" into qt-r1-dev