Merge "Fix SimplifyIfs() trying to redirect exception handler edges."