Merge "diag: Cleanup control channel status when peripheral goes down"