Merge "Modifications in audio effect engine state management." into gingerbread