Fix NPE  in system settings

Navbar settings was disabled previously. A merge turned them on again.

Change-Id: I2c58e6ba5ee327153cf0f701761e6e6b23964bb4