Merge "Initial commit for MediaSession test app"