Revert "Settings: Disable navbar options when navbar disabled."

This reverts commit af060b27a8243cec50c3114cde302f553b2b482e.

Change-Id: Iedef31c332f7b4eb21d4ae52bf9065bd8b9f93f3
Allow changing theme to Holo.Light without crashing

Themes that attempt to change the settings theme's parent to
Holo.Light will end up crashing wifi settings.

Themers should override Theme.Settings.Base and leave Theme.Settings.Holo
alone.  Attempting to theme Theme.Settings.Holo will result in crashes
when accessing wifi settings.

This was patch was adapted from
https://github.com/tung91/android_packages_apps_Settings/commit/007f03b559c6d13115c63c4f601ebc4b9324d32d

Change-Id: I61951b892acac6304d2c3dd02668eb70af93eef9
Merge "Allow changing theme to Holo.Light without crashing" into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD