Merge "aiv-play: Rename aiv.play to aiv.play.generic"