Merge "Added intents for audio effects control application" into gingerbread