Merge "Test to verify accessibility button flag updates"