Merge "Do not show remove button unless item is selected or reordering." into main