Merge "Shortened and adjustable screen timeouts" into qt-r1-dev