Merge "Implemented Interaction states for Shortcut Helper" into main