Merge "Always assign layer when restacking special windows." into nyc-dev am: 7e25024
am: 6c7926e

* commit '6c7926eff18e51f0def833d25abb35e70e0696e6':
  Always assign layer when restacking special windows.

Change-Id: Ie0e2053a3cd2671cd6bf5a0639d468ab7655b55c