fix audio volume issue and sync jb25 branch