Merge bug in AppPreferencesDialog: Cancel button broken!