Settings: Check to see if menu items are null onPause.

Change-Id: I5463b1eab1017840ec1ec204090c9c61603377a3
Settings: Disable navbar options when navbar disabled.

Change-Id: I675df3fd71e9103ca814370e30c21663870ae53a
Revert "Settings: Disable navbar options when navbar disabled."

This reverts commit af060b27a8243cec50c3114cde302f553b2b482e.

Change-Id: Iedef31c332f7b4eb21d4ae52bf9065bd8b9f93f3
Merge branch 'cm-11.0' into cm-11.0-sc