Merge "Don't show the battery saver toast when the screen turns on"