Merge "Fix an incorrect display position of error popup in RTL layout"