Merge "Fix a regression in SearchView focusability" into lmp-dev