Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev