Merge "Fix NPE in NavigationBarView during bugreport" into cm-10.1

Change-Id: I610acc951893a97515a61add90af4f8f6186ee78