Merge "Shortcut Helper: dismiss when switching to a different user" into main