Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev