Merge "Skip resuming activities on sleeping display" into rvc-qpr-dev