Merge "[Keyboard Shortcut] increase search hint char limit" into main