Merge "Flag guard modifier key remapping"