Merge commit 'd2e3b0139009b98be5ed825e58c38a325240594e' * commit 'd2e3b0139009b98be5ed825e58c38a325240594e': Edit second line of Search settings. First part of fix to bug1928620.
Merge commit 'd2e3b0139009b98be5ed825e58c38a325240594e' * commit 'd2e3b0139009b98be5ed825e58c38a325240594e': Edit second line of Search settings. First part of fix to bug1928620.