Merge "Properly cancel Tether notification." into jb-mr1-dev