Merge "MediaSessionService: Cache active sessions per an user" into oc-dev