Merge "Don't call into audiomanager holding a zen lock." into nyc-dev