Merge "Do not display unsecure windows behind dialogs"