Merge "Scaffold back arrow should be pointing right when rtl"