Merge "Prevent crash when unregsiter the broadcast" into tm-dev