Settings: Only show clear button when search field has text.

Change-Id: I69bf6a31a933459be2c652434aec412105395dcc
Merge remote-tracking branch 'upstream/kk44' into kk44