Merge "Shortened and adjustable screen timeouts" into qt-r1-dev
am: 969c3d9b87

Change-Id: I5f85c2db188915ff82bfc8ffa2299406d780e285