Merge "When restacking IM windows preserve relative order." into nyc-dev
am: db973df

* commit 'db973df830c32af8e2aeff256053299409f65dfd':
  When restacking IM windows preserve relative order.

Change-Id: I9e6a52ea69f908fbebd8a39208d071ff70b97db0