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

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