Merge "Add timer to wait for screen off"