Merge "Shortcuts panel." into main