Merge "[Search] Avoiding hiding keyboard when clearing search text" into sc-v2-dev