Merge "Fix vertical nav button direction issue" into nyc-mr2-dev