Search Provider: Remove Action.ASSIST preference
Always return to Trebuchet on return gesture.

Change-Id: I92ca0dc3bfcb7763691a1d73381c2a6cebebdae3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0