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

* commit '13ab0f50b145baf3605cfd50fd93fddc1d0b25db':
  Improve MultiWindow sample

Change-Id: Ie762ec28b81051a9549f2034f0ff39506656da17