Merge "Refactor locks in "audio" service for device management"