Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394' * commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394': Don't reinflate search bar when dialog is already showing
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394' * commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394': Don't reinflate search bar when dialog is already showing