Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev