Merge "Cancel notification on tile click" into sc-dev