Merge "Fix accessibility settings page did not update the preference state" into sc-dev