Merge "Make framework modifier key handling more precise."