Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b" into qt-r1-dev-plus-aosp