Merge "Only reorient nav bar if needed" into nyc-mr1-dev
am: 34b68d3c84

Change-Id: I42873135ca5fd58e24825c686b4b562cd16dab4b