Merge "Really fix the build - one more change to SearchDialog which shouldn't have been submitted."