Merge "Revert "On device search UI template name cleanup"" into sc-dev
tree: 70ea0a423dcbb97667572718c9f932d10c97abe2
  1. iconloaderlib/
  2. searchuilib/