Merge "Atomically apply windowing mode and display windowing mode"