Merge "Move more Accessibility stuff to SettingsLib"