Move windowing layers appropriately

This wasn't previously possible due to conflicts with phone views. Now
that the phone views are removed, we should be able to use the
appropriate windowing layers.

Bug: 153732333
Test: manual
Change-Id: I23cf16324eff6b4883ab93afe7e35e6d5a9b97d3