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

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