Merge "MediaSessionService: Nullify the media button sesison when it's removed" into oc-dev