Merge "Don't start ErrorDialogActivity without an error ID" into mnc-dev