Merge "Fix animation of settings button in RTL layout case"
am: cc3525748e

Change-Id: I112d770b8cf520755128d4fabd973762b2c5c4b1