Merge "Search bar will receive focus by default in shortcut helper" into main