Merge "No blackscreen when dialog is showing fixes 5511992"