Merge "ecore window handle storage"