Merge "Remove bal_require_opt_in_same_uid flag" into main