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