Merge "Only adjust window layers from WindowLayerController"