Merge "Fix CTS issues for PopupWindowTest" into lmp-mr1-dev