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