Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo