Merge "Fix PopupWindow's wrong location" into rvc-dev