Merge "Synchronous audio focus behavior with external focus policy"