Merge "Revert "Bypass audio focus handling for VDM""