Merge "Cancel notifications when user tap on Details or Take Screenshot after service died." into nyc-dev