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

Change-Id: If98a311504bd706987776c8a51b6e8b2bd144347