Merge "Use current user Context to generate NavBar layout" into tm-dev