Merge "Clean up old Context references in ImsConfig"