Merge "MockPlayer: rename setVolume to setPlayerVolume"