Merge "MediaSession: Add new methods for preparing media content" into nyc-dev