Fix removement of NavBar category on non-NavBar devices

PS2
fixed PreferenceCategory nesting

Change-Id: Ia9615aa09b2e3c294d54e593e6537dd79ad3daff