Merge "Test that uninstall activity hides overlays" into qt-dev