Merge "Only reorient nav bar if needed" into nyc-mr1-dev