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