Merge "Sort inline suggestions" into main