Merge "Improve MultiWindow sample" into nyc-dev