Merge "Allow SimDialogActivity to be started for result"