Merge "Correctly set mContainingFrame for PopupWindows in multi-window mode"