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

Change-Id: Ic39bf39c559242a832c459080c87e502cfc24c36