Merge "Focus search container by default" into main