Merge "Fix an incorrect display position of error popup in RTL layout" am: b7941c50a0
am: 0863cf4e40

Change-Id: Ief495fcc7e6f711696ed6337ab65face9d03c981