Merge "Save and restore the instance state of StkDialogActivity correctly"