Merge "Bring back buttons in dialogs. Bug #2390537"