Merge "Enforce the cross-profile intent check."