Merge "Fixes hotspot list transitions, update to use a single hotspot" into lmp-preview-dev