Merge "fix an issue where the screen could stay off"