Merge "CapturedActivity: Ensure we keep the screen on." into qt-dev