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

* commit '24cd97aba3cc388ec639a4627e67e96dc4e65ac1':

Change-Id: I6c0218cb177ce43599ff706f89a84764f8ce99d7