Merge "Fix PopupMenuTest#testBasicContent in landscape." into nyc-support-24.1-dev