Merge "Hide two audio focus methods." into froyo