Merge "Fix UIEvent ID collision." into rvc-dev