Merge "Re-add tethered notification to framework."