Merge "Handle SpacerItem on click correctly."