Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev