Merge "Don't allow concurrent starts and stops and clean up receiver"