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

Change-Id: I436bbdb7ec1a1cdada77180876c133c1a18c954e