Normalize modal overlay dialogs #8666

Merged
merged 10 commits into from May 4, 2017