Merge "Improve MultiWindow sample" into nyc-dev am: 13ab0f50b1
am: 453d2d5af5

* commit '453d2d5af5a4e82910fd3ed17bf83ffbac240985':
  Improve MultiWindow sample

Change-Id: I23d2693ed12c7f495920af0da2478e21ac138b46