Make sure ui.dialog is set before overriding
Merge branch '7.x-3.x' of git.drupal.org:project/oa_radix into 7.x-3.x