Merge "Fix searching work app in settings" into oc-dr1-dev
am: e3d890eaae  -s ours

Change-Id: Ifbb300aa90cad12431121c380aa306d04dedb5bd