Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev