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