Merge "Fix missing dialog windows"