Merge "Shrink popup window in PopupWindowTest to run on sw240dp screens"