am c2edfa2b: am 7c292062: Merge "Process all display events in order"

# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'c2edfa2b9649f67c142b181c54580c015badfca3':
  Process all display events in order