am 015ec39d: am 5985d106: am c7dd6640: Merge "Fix audio focus evaluation order for display update" into jb-mr1.1-dev

* commit '015ec39dffe54687781357f9ef751b6218159c5d':
  Fix audio focus evaluation order for display update