Merge "[DO NOT MERGE] Revert "Allow user to block individual apps from resuming"" into rvc-qpr-dev