Prepare for release.
Tidied.
Fixed: vertical scroll not shown in search screen (bug#10413).
Merge remote-tracking branch 'upstream/rel-3_2' into rel-3_2