Merge "MediaSessionService: Keep the media sessions per full user"