Bug fixes: Hotspot duplicated on rotation after creation & Hotspot toggle not working correctly