Merge "Fix a couple small issues in nav bar fragment" into rvc-dev