Merge "Fix small issues in NavigationView."