Merge "Fix null pointer check elimination for catch entries."