Merge "Restrict usage of PopupWindow::mOverlayAnchor"