Merge "Fix a couple small issues in nav bar fragment" into rvc-dev am: 5a7fa9af64 am: 7fce2f4efe am: df9d84bb3d
Change-Id: I7ee69ce3d079281fff5e21bdeb60a51072928157
This commit is contained in: