Merge "DO NOT MERGE Correctly reset cross-profile app-op" into rvc-qpr-dev