Merge "Use right starting window resource in multi-window mode." into nyc-dev