Vivo: Cleanup & rework overlay

Also a possible fix for BT Tethering.