Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev am: 061e5065 am: f0380367 Change-Id: I51bad58b07d96228acac4efba682fbc31dafa218