Merge "Multi-window assist callback" into nyc-dev