Merge "Fix NPE in NavigationBarFragment"