Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev am: 061e5065db

Change-Id: Ib5dd6d81498f7166bc6509ffea0d1236086c96d5