Merge "Rename settings category." into pi-dev am: a44d07c10d
am: 374d15333f

Change-Id: Ic6b4980793aa8360b156fc11e36e79e1ba1f6635