Fix removement of NavBar category on non-NavBar devices

PS2
fixed PreferenceCategory nesting

Change-Id: Ia9615aa09b2e3c294d54e593e6537dd79ad3daff
merge changes from Omni 4.4 into local branch

Conflicts:
	res/xml/bars_settings.xml
	src/org/omnirom/omnigears/interfacesettings/BarsSettings.java

Change-Id: Ibd0248eb0ba5fb71a2984656d21daa77f6d2cb07