PLF-4855: Unified search autofocus on search field, fix merge error