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