Fixed bug#10399 - Columns Settings lost after search.
Merge remote-tracking branch 'upstream/master'