Merge "MediaSession2: Make SessionCallback.onDisconnected be called" into pi-dev