Merge "Shouldn't turn on other accessibility features in SuW." into rvc-dev