add cherry-pick to fix audio pop/static