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

the deleted file i forgot to remove in other commit

Change-Id: Ic7db2b70d7cc4947808d951a843362e63cec4168