Merge "SearchFormWidget: Move hidden fields below the ActionFieldLayout"