Merge changes Ief8be842,I474ff193

* changes:
  Fix launcher crash loop.
  Revert "Fix launcher crash loop."
tree: 9a8272b1c2c821ea6060014a22ace7ba59064cce
  1. iconloaderlib/
  2. searchuilib/