Pushing up item selection. (reverse-merged from commit 8b16b936d3a0b683cc79271501bf7dec3b36db9b)