Merge "Fix multi-window assiststructure trashing" into nyc-dev