Merge "Fix KeyEventInterceptTest fail" into rvc-dev