Merge "Fix key location API, when many to one key mapping with KL flags" into main