Merge "Allow user to block individual apps from resuming" into rvc-qpr-dev