Merge "Wire up secondary clicks to tiles" into main