Merge "Insert EMPTY_DIVIDER LayoutType" into sc-dev
tree: 24455c011ad2d2f0f11e1d1eba047cf0cb878f08
  1. iconloaderlib/
  2. searchuilib/