Bug 1048022 - Only reset search activity when launched from new intent. r=eedens
Bug 1050356 - Make search widget indentation consistent with FirefoxSearch repo. r=wesj
Bug 1043032 - Use "+" icon for jump button in search suggestions. r=eedens
Merge m-c to fx-team a=merge
Merge m-c to fx-team a=merge
Bug 1037740 - Update empty private tabs panel styles for small tablet. r=wesj
Bug 1050314 Loop standalone client is broken in Chrome due to use of ES6 functions. r=dmose
Bug 1049927 Update OpenTok library to 2.2.7. r=dmose
Merge latest green fx-team changeset and mozilla-central; a=merge