Merge "Center nav bar vertically" into tm-dev