Merge "Adjust lookup table mechanism to support new UI of conditional card"