Merge "Decouple display area from windowing layer"