Merge "Don't unregister receiver twice." into jb-dev