Merge "Improved audio focus handling for CARSM" into nyc-dev