Reorganized system_settings.xml

Change-Id: I735961d4ab105e21e12e973f7f432e634b37b96a