Merge "Update Shortcut Help buttons" into main