Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev