Merge "Check for locked screen in DisplayRotation and disable rotation resolver when power save mode is enabled" into sc-dev