Merge "Fixes back button direction when toggling rtl and ltr"