Merge "Introduce #createWindowContext with display"