Merge "[dual shade] Adds haptic to dual shade expansion." into main