Merge "Revert deletion and deprecate few PopupWindow methods"