Fix an ANR in the search section
Merge branch 'development'