Merge "MediaSession2: Fix controller is disconnected immediatly after connected"