Merge "Improve MultiWindow sample" into nyc-dev am: 13ab0f50b1 am: 453d2d5af5
am: 378ffa62e9  -s ours

* commit '378ffa62e91597a630743824bcab83d694f25166':
  Improve MultiWindow sample

Change-Id: I348c6e7ea4087ef1d8ecb9b5ab7df9899e11072c