Merge change 9147 into donut

* changes:
  Fix in-app search shortcut icons