Merge 1. Support DOCK Audio 2. Fix build breaks