Merge "Correctly update rtl state in navbar once language changes"