Merge "Fix NPE when calling Session#addToDisplayWithoutInputChannel" into pi-dev