Merge "Add flag for the fix for MU toggle behaviour when no_switch_user is applied" into main