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

Change-Id: I6fee85779f6ffc5e61fb7fe1fa91dcc38a99c712