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

Change-Id: I96476450550e726c3ac6c07e39afcd175cfee043