Merge "Remove notification right after clicking on cancel"