Merge "Exempt companion apps from auto revoke" into rvc-dev