Merge "Modify type of some environmental reverb parameters" into gingerbread