Merge "Only reset search field when back key is hit if there is no query." into ub-launcher3-calgary-polish
am: 6a7ca92f72

Change-Id: Ib3212c0a393d6e4ccf8e56a456b8642d10e65287