Merge "Make activities invisible when the display is turned off." into qt-dev