Merge "MediaSession2: Implement playFromXXX and prepareFromXXX"