Merge from avplayer:master