Merge "Reducing unnecessary activity pause if activity can turn on screen" into main