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

* commit '701f63f1b3b801c74749f0e7c2c72d5ffb7c3640':

Change-Id: I9230a46f15500b5d405486d3c0d95c6a3569242c