Update system_ui_settings.xml
Conflicts:
	res/xml/system_ui_settings.xml