Merge "Fix crash due to unregistered receiver"