Merge "Create a flag for cross-user suspension." into main