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

This reverts commit af060b27a8243cec50c3114cde302f553b2b482e.

Change-Id: Iedef31c332f7b4eb21d4ae52bf9065bd8b9f93f3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0