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

Change-Id: I8c43bf3742f2de724e9f0441396b9b5cd1255e90