Merge "Process focus events first" into rvc-dev am: 0b257105a2 am: cedd7327dd

Change-Id: I49a4fd9407529e4d31df63bb6bab5099c905f62e