Merge "Add internal APIs to support modifier key remapping"