Merge "Fix notification cancel reason when AutoCancel flag is present"