Merge "Introduce display windowing mode to WindowConfiguration"