Merge "Fix a couple small issues in nav bar fragment" into rvc-dev am: 5a7fa9af am: 7fce2f4e am: bf5751bc Change-Id: I4ebcd72fcef4bf7d088465dc97cd736c23510aa9