Merge "Asset swap and make SearchView use themed context"