Merge "Revert "Do not use the handler for receiver broadcasts."" into rvc-dev