Merge "Set AppErrorDialog result during dismissal if it isn't already set" into mnc-dev