We don't have the navigation bar categary

Change-Id: I5cc8adc68462ee579f8e63f6ed345b9694e6dc38
Null check in onResume

Change-Id: I90869daed48b626de93940c438854a5388ec1926
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7