Merge "Revert "Create DeviceConfig class for positioning bubbles"" into main