Merge "Fix "AlertDialogTestActivity has leaked window" issues" into nyc-support-25.2-dev