Merge "Initial setup for slot change receiver migration"