Merge "Move selection manager extras to separate package."