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

Change-Id: I6e09eb05d1715eb5f50619fe0f38219703d095c3