Merge "Add a mechanism for handling audio device configuration change"