Merge "Make PopupWindows into root namespaces"