Merge "Cleaned up dialButtonPressed."