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