Merge "support audio context properly" into nyc-dev