Merge "Make sure receivers are using BroadcastDispatcher" into tm-qpr-dev