Merge "Shortcut Helper - Fix bottom sheet height" into main