DDF-165: merged SearchUI clear button fix into 2.2.x
DDF-165 merge