Merge "Process focus events first" into rvc-dev