sound: Merge oppo changes