Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev

* changes:
  Favor setup face in search settings.
  Remove highlighting for work profile