Merge "Fixed button bar alignment issue in RTL languages"
am: 403c8f72e3

Change-Id: I8a14f71b20fd07ac3fd9025ba4e303a11709fe0a