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

* commit '7e25024758c2aff4b70024c70d931f81ad25cbd6':
  Always assign layer when restacking special windows.

Change-Id: I40cbf8607161cb393ab1a2d1630790563fe3ce30