Merge "fix a deadlock when removing a DisplayEventConnection"