Merge "Null check on NavigationBarView in NavigationBarFragment"