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