Merge "Improve MultiWindow sample" into nyc-dev am: 13ab0f50b1
am: 76895e8aed

* commit '76895e8aedfcaf077d303356b64c747b46f44511':

Change-Id: Id4d6628a3e08d73290bdfec9dcff86474cf5d4cf