Merge "Fix a couple small issues in nav bar fragment" into rvc-dev am: 5a7fa9af am: 6b00e18f am: d98374f8 Change-Id: I4e1825516ef685e557128ca7747867c07c428e3f