Merge "Fix audio focus logging" into nyc-dev