Merge "Fix RTL in Nav Bar" into nyc-dev