Merge commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5' * commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5': Reserve space for the searchbox spinner, even when stopped.
Merge commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5' * commit 'afdcaf8b23b0497edc6db7353fee4074323ffeb5': Reserve space for the searchbox spinner, even when stopped.