[automerger skipped] Merge "Set the negative button when configuration changes and dialog is restored" into qt-qpr1-dev am: 42c6f1693b
am: 7e47daba89 -s ours
am skip reason: SHA1 7e47daba89 skipped by user kchyn

Change-Id: Ib49c88527bfcb8e9240b309afd6ee111c0664678