Merge "Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev am: 061e5065 am: 10bbc3f1" into rvc-d1-dev-plus-aosp