Merge "Fix AppErrorDialogTest failure"