Bring back QuickReturn behavior for search bar

Change-Id: Ic0cf4fc9611c97b095c8506253bb9ab2ab19f7bd