Merge "Workaround for assist crash with multiwindow" into nyc-dev