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