Merge "Audio focus: fix delayed focus request during locked focus behavior"