Merge "Fix showing gear behind notification when RTL language selected" into nyc-dev