Merge "Remove notification right after clicking on cancel" am: 00cf589f45 am: 08be4d3510

Change-Id: Ica2810c69098903674d6743ad4f0dfdf3ea801a9