Start to re-organize some stuffs in system_settings.xml

Change-Id: If77e3b10a5647feea8fb130c4d7ef8e40f98cb0e