Merge "Save and restore the instance state of StkDialogActivity correctly"
am: 4424ddfba1

Change-Id: Ic48e6556684f8ccaa9c24b60eef972ad0a5a1fa6