Merge "Skip checking if a broadcastreceiver was already registered" into main