Merge "PopupWindow animation fixes"