Merge "Do not turn off screen before locking out device" into main