Merge "TRON refinements for multi-window" into nyc-dev