ARWE-367 In the cleaner selection popup, selected cleaners should stay on top