Merge commit 'af0b780a' into eclair * commit 'af0b780a': Update SearchManager documentation to reflect latest behavior.