Merge "Set the negative button when configuration changes and dialog is restored" into qt-qpr1-dev