Merge "Revert "Remove useless broadcast registeration""