Merge "Fix PopupWindow's wrong location" into rvc-dev am: 4f4706de1f am: e1a515fe85 am: 3709c6bf85 am: 4a67a16837

Change-Id: I841ee5b4d98a4098df55381a6cc9dac737148828